Skip to content

Commit

Permalink
Add back forge and fml ats now that they can work.
Browse files Browse the repository at this point in the history
  • Loading branch information
thecatcore committed Aug 17, 2023
1 parent 153158b commit 00733d0
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 113 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ allprojects {
implementation(group: "local", name: "guava", version: "12.0.1")

modImplementation(legacy.apiModule("legacy-fabric-logger-api-v1", "1.9.0+1.8.9"))

// modRuntimeOnly(files("./forge-${project.minecraft_version}-${project.forge_version}-universal-intermediary.jar"))
}

processResources {
Expand Down Expand Up @@ -109,6 +107,8 @@ dependencies {
include(group: "local", name: "guava", version: "12.0.1")

include("org.apache.commons:commons-lang3:3.12.0")

// modRuntimeOnly(files("./forge-${project.minecraft_version}-${project.forge_version}-universal-intermediary.jar"))
}

subprojects {
Expand Down
88 changes: 44 additions & 44 deletions src/main/resources/fml_at.cfg
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
#Main FML Access Transformer configuration file
# TileEntity addMapping
public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # TileEntity/func_70306_a
public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
# EntityList addMappings
public lf.a(Ljava/lang/Class;Ljava/lang/String;I)V # EntityList/func_75618_a
public lf.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a
public lf.b # EntityList/field_75625_b nameToClassMap
public lf.c # EntityList/field_75626_c classToNameMap
public lf.d # EntityList/field_75623_d idToClassMap
public lu.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
public lu.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
public lu.b #FD:EntityList/field_75625_b #nameToClassMap
public lu.c #FD:EntityList/field_75626_c #classToNameMap
public lu.d #FD:EntityList/field_75623_d #idToClassMap
# RenderEngine
public azc.h # RenderEngine/field_78367_h textureList
public azc.k # RenderEngine/field_78366_k texturePack
public bai.h #FD:RenderEngine/field_78367_h #textureList
public bai.k #FD:RenderEngine/field_78366_k #texturePack
# RenderManager
public azw.o # RenderManager/field_78729_o renderers
public bbc.p #FD:RenderManager/field_78729_o #renderers
# RenderBlocks - everything
public azd.*
public azd.*()
public baj.* #FD:RenderBlocks/*
public baj.*() #MD:RenderBlocks/*
#RenderPlayer
public-f baq.h # RenderPlayer/field_77110_j armorlist
public-f bbw.h #FD:RenderPlayer/field_77110_j #armorlist
#RenderBiped
public-f bae.k # RenderBiped/field_82424_k armorlist
public-f bbk.k #FD:RenderBiped/field_82424_k #armorlist
#StringTranslate
public be.b # StringTranslate/field_74815_b
public be.d # StringTranslate/field_74813_d
public bm.b #FD:StringTranslate/field_74815_b
public bm.d #FD:StringTranslate/field_74813_d
# TileEntityRenderer
public bby.m # TileEntityRenderer/field_76966_m
public bde.m #FD:TileEntityRenderer/field_76966_m
# CraftingManager - make the add recipe methods public
public vq.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a
public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
public wh.a(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77595_a
public wh.b(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
# WeightedRandomItem
public kg.a # WeightedRandomItem/field_76292_a probability
public ku.a #FD:WeightedRandomItem/field_76292_a #probability
# ItemStack
#public+f tv.c # ItemStack/field_77993_c itemId
#public+f tv.c #FD:ItemStack/field_77993_c #itemId
# StatBase
public jc.a # StatBase/field_75978_a statName
public jk.a #FD:StatBase/field_75978_a #statName
# NetLoginHandler
public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
public ik.h # NetLoginHandler/field_72543_h userName
public is.a(Lis;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
public is.h #FD:NetLoginHandler/field_72543_h #userName
# EntityPlayerMP getNextWindowId
public ih.cd()V # EntityPlayerMP/func_71117_bO
public ih.cv # EntityPlayerMP/field_71139_cq
public ip.cg()V #MD:EntityPlayerMP/func_71117_bO
public ip.cs #FD:EntityPlayerMP/field_71139_cq
# EntityAITaskEntry
public mo
public nd #CL:EntityAITaskEntry
# EntityAITasks
public mn.a # EntityAITasks/field_75782_a taskList
public nc.a #FD:EntityAITasks/field_75782_a #taskList
# BlockChest
public ahy.n(Lxd;III)Z # BlockChest/func_72292_n isOcelotBlockingChest
public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
# EntityLiving
public ln.aS # EntityLiving/field_70736_aM carryoverDamage
public ln.bn # EntityLiving/field_70714_bg tasks
public ln.bG # EntityLiving/field_70703_bu isJumping
public mc.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
public mc.bm #FD:EntityLiving/field_70714_bg #tasks
public mc.bE #FD:EntityLiving/field_70703_bu #isJumping
# EntityAIOcelotSit
protected na.a(Lxe;III)Z # EntityAIOcelotSit/func_75398_a nearestSittableBlock
protected na.f()Z # EntityAIOcelotSit/func_75399_f isblocksittable
protected np.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
protected np.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
# CallableMinecraftVersion - sanity check the MC version
public b
public b.<init>(La;)V # constructor
public b #CL:CallableMinecraftVersion
public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
# EntityAnimal
public oh.d # EntityAnimal/field_70881_d inLove
public oy.d #FD:EntityAnimal/field_70881_d #inLove
# WorldType
public xp.<init>(ILjava/lang/String;)V
public xp.<init>(ILjava/lang/String;I)V
public yg.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
public yg.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
# ComponentVillage
public aeq
public afl #CL:ComponentVillage
# EntityVillager - minmax lists
public qd.a(Lww;ILjava/util/Random;F)V # EntityVillager/func_70948_a addBuy
public qd.b(Lww;ILjava/util/Random;F)V # EntityVillager/func_70949_b addSell
public qd.bP # EntityVillager/field_70958_bB
public qd.bQ # EntityVillager/field_70960_bC
public qu.a(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
public qu.b(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
public qu.bN #FD:EntityVillager/field_70958_bB
public qu.bO #FD:EntityVillager/field_70960_bC
# GuiButtonMerchant
public aum
public avr #CL:GuiButtonMerchant
141 changes: 74 additions & 67 deletions src/main/resources/forge_at.cfg
Original file line number Diff line number Diff line change
@@ -1,95 +1,102 @@
#Main Forge Access Transformer configuration file
# RailLogic.getNAdjacentTracks
public akh.a(Lakh;)I # RailLogic/func_73650_a
public all.a(Lall;)I #MD:RailLogic/func_73650_a
# Tessellator
public-f azb.a # Tessellator/field_78398_a instance
public azb.u # Tessellator/field_78409_u drawMode
public azb.v # Tessellator/field_78408_v xOffset
public azb.w # Tessellator/field_78407_w yOffset
public azb.x # Tessellator/field_78417_xzOffset
public azb.z # Tessellator/field_78415_z isDrawing
public-f bah.a #FD:Tessellator/field_78398_a #instance
public bah.u #FD:Tessellator/field_78409_u #drawMode
public bah.v #FD:Tessellator/field_78408_v #xOffset
public bah.w #FD:Tessellator/field_78407_w #yOffset
public bah.x #FD:Tessellator/field_78417_x #zOffset
public bah.z #FD:Tessellator/field_78415_z #isDrawing
# ItemPickaxe
public uc.<init>(ILtu;)V # constructor
public+f uc.c # ItemPickaxe/field_77867_c blocksEffectiveAgainst
public ut.<init>(ILul;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f ut.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
# ItemAxe
public tr.<init>(ILtu;)V # constructor
public+f tr.c # ItemAxe/field_77868_c blocksEffectiveAgainst
public ui.<init>(ILul;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f ui.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
# ItemSpade
public un.<init>(ILtu;)V # constructor
public+f un.c # ItemSpade/field_77866_c blocksEffectiveAgainst
public ve.<init>(ILul;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f ve.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
# ItemTool
public td.a # ItemTool/field_77864_a efficiencyOnProperMaterial
public td.ck # ItemTool/field_77865_bY damageVsEntity
public tu.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
public tu.cl #FD:ItemTool/field_77865_bY #damageVsEntity
# EntityEnderman
public pm.d # EntityEnderman/field_70827_d carriableBlocks
public qd.d #FD:EntityEnderman/field_70827_d #carriableBlocks
# RenderGlobal
public ayy.h # RenderGlobal/field_72769_h theWorld
public ayy.i # RenderGlobal/field_72770_i renderEngine
public ayy.q # RenderGlobal/field_72777_q mc
public ayy.r # RenderGlobal/field_72776_r globalRenderBlocks
public aty.E # RenderGlobal/field_72738_E damagedBlocks
public bad.h #FD:RenderGlobal/field_72769_h #theWorld
public bad.i #FD:RenderGlobal/field_72770_i #renderEngine
public bad.q #FD:RenderGlobal/field_72777_q #mc
public bad.r #FD:RenderGlobal/field_72776_r #globalRenderBlocks
public bad.E #FD:RenderGlobal/field_72738_E #damagedBlocks
# SoundManager
public bcx.a # SoundManager/field_77381_a sndSystem
public bcx.b # SoundManager/field_77379_b soundPoolSounds
public bcx.c # SoundManager/field_77380_c soundPoolStreaming
public bcx.d # SoundManager/field_77377_d soundPoolMusic
public bed.a #FD:SoundManager/field_77381_a #sndSystem
public bed.b #FD:SoundManager/field_77379_b #soundPoolSounds
public bed.c #FD:SoundManager/field_77380_c #soundPoolStreaming
public bed.d #FD:SoundManager/field_77377_d #soundPoolMusic
# EntityMinecart
protected ph.* # All private -> protected
public ph.h()Z # EntityMinecart/func_70490_h isMinecartPowered
protected py.* #FD:EntityMinecart/* # All private -> protected
public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
# Block
public alf.<init>(ILafg;)V #Constructor
public alf.<init>(IILafg;)V #Constructor
public alf.r()Lalf; # Block/func_71912_p setRequiresSelfNotify
public alf.a(Lalj;)Lalf; # Block/func_71884_a setStepSound
public alf.b(F)Lalf; # Block/func_71894_b setResistance
public alf.c(F)Lalf; # Block/func_71848_c setHardness
public alf.h(I)Lalf; # Block/func_71868_h setLightOpacity
public alf.a(F)Lalf; # Block/func_71900_a setLightValue
public alf.s()Lalf; # Block/func_71875_q setBlockUnbreakable
public alf.b(Z)Lalf; # Block/func_71907_b setTickRandomly
public alf.a(FFFFFF)V #Block/func_71905_a setBlockBounds
public amj.<init>(ILagb;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
public amj.<init>(IILagb;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
public amj.r()Lamj; #MD:Block/func_71912_p #setRequiresSelfNotify
public amj.a(Lamn;)Lamj; #MD:Block/func_71884_a #setStepSound
public amj.b(F)Lamj; #MD:Block/func_71894_b #setResistance
public amj.c(F)Lamj; #MD:Block/func_71848_c #setHardness
public amj.h(I)Lamj; #MD:Block/func_71868_h #setLightOpacity
public amj.a(F)Lamj; #MD:Block/func_71900_a #setLightValue
public amj.s()Lamj; #MD:Block/func_71875_q #setBlockUnbreakable
public amj.b(Z)Lamj; #MD:Block/func_71907_b #setTickRandomly
public amj.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
# NetServerHandler
public im.g # NetServerHandler/field_72572_g playerInAirTime
public iu.g #FD:NetServerHandler/field_72572_g #playerInAirTime
# TileEntity
public amm.k # TileEntity/field_70331_k worldObj
public anq.k #FD:TileEntity/field_70331_k #worldObj
# BlockLeavesBase
public aln.c # BlockLeavesBase/field_72131_c graphicsLevel
public amr.c #FD:BlockLeavesBase/field_72131_c #graphicsLevel
# Item
public tt.e(I)Ltt; # Item/func_77656_e setMaxDamage
public-f tt.f(Ltv;)I # Item/func_77650_f getIconIndex
public uk.<init>(I)V #MD:Item/<init>(I) #Constructor
public uk.e(I)Luk; #MD:Item/func_77656_e #setMaxDamage
public-f uk.f(Lum;)I #MD:Item/func_77650_f #getIconIndex
# RailLogic
public akh
public akh.a(Lakh;)I # RailLogic/func_73650_a getNAdjacentTiles
public all #CL:RailLogic
public all.a(Lall;)I #MD:RailLogic/func_73650_a #getNAdjacentTiles
# EntityPlayer
public qg.a(Lpg;)V # EntityPlayer/func_71012_a joinEntityItemWithWorld
public qg.i()V # EntityPlayer/func_71053_j closeScreen
public qx.a(Lpx;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
public qx.i()V #MD:EntityPlayer/func_71053_j #closeScreen
# EntityPlayerMP
public axc.a(Lpg;)V # EntityClientPlayerMP/func_71012_a joinEntityItemWithWorld
public ayh.a(Lpx;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
# World Gen Chests Related
public ie.S # WorldServer/field_73069_S bonusChestContent
public abq.a # StructureMineshaftPieces/field_78818_a mineshaftChestContents
public acu.i # ComponentScatteredFeatureDesertPyramid/field_74941_i itemsToGenerateInTemple
public acv.l # ComponentScatteredFeatureJunglePyramid/field_74943_l junglePyramidsChestContents
public acv.m # ComponentScatteredFeatureJunglePyramid/field_74944_m junglePyramidsDispenserContents
public adf.a # ComponentStrongholdChestCorridor/field_75003_a strongholdChestContents
public adj.b # ComponentStrongholdLibrary/field_75007_b strongholdLibraryChestContents
public ado.c # ComponentStrongholdRoomCrossing/field_75014_c strongholdCorridorChestContents
public aem.a # ComponentVillageHouse2/field_74918_a villageBlacksmithChestContents
public im.T #FD:WorldServer/field_73069_S #bonusChestContent
public aci.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
public adm.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
public adn.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
public adn.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
public adx.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
public aeb.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
public aeg.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
public afh.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
# AnvilChunkLoader.chunkSaveLocation
default zn.d # AnvilChunkLoader/field_75825_d
default aaf.d #FD:AnvilChunkLoader/field_75825_d
# ChunkProviderServer.currentChunkLoader
default id.e # ChunkProviderServer/field_73247_e
default il.e #FD:ChunkProviderServer/field_73247_e
# PlayerManager
default ib.a(IIZ)Lic; # PlayerManager/func_72690_a getOrCreateChunkWatcher
default ij.a(IIZ)Lik; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
# World
public-f xe.C # World/field_72982_D villageCollectionObj
public xe.H # World/field_72993_I activeChunkSet
public-f xv.C #FD:World/field_72982_D #villageCollectionObj
public xv.H #FD:World/field_72993_I #activeChunkSet
# EntityLiving
public ln.bc # EntityLiving/field_70728_aV experienceValue
public mc.bc #FD:EntityLiving/field_70728_aV #experienceValue
# GuiFlatPresets
public asr.a(Ljava/lang/String;ILxz;Ljava/util/List;[Labm;)V # GuiFlatPresets/func_82294_a
public asr.a(Ljava/lang/String;ILxz;[Labm;)V # GuiFlatPresets/func_82297_a
public atw.a(Ljava/lang/String;ILyr;Ljava/util/List;[Lace;)V #MD:GuiFlatPresets/func_82294_a
public atw.a(Ljava/lang/String;ILyr;[Lace;)V #MD:GuiFlatPresets/func_82297_a
# BiomeGenBase
public xz.*() # Everything protected->public
public yr.*() #MD:BiomeGenBase/* #Everything protected->public
# MapGenVillage
public-f aea.e # MapGenVillage/field_75055_e villageSpawnBiomes
public-f aev.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
# ShapedRecipes
public+f wk.d #FD:ShapedRecipes/field_77574_d #recipeItems
public+f wk.b #FD:ShapedRecipes/field_77576_b #recipeWidth
public+f wk.c #FD:ShapedRecipes/field_77577_c #recipeHeight
# ShapelessRecipes
public wl.b #FD:ShapelessRecipes/field_77579_b #recipeItems

0 comments on commit 00733d0

Please sign in to comment.