From a92f29115c57a92cb102efc978cca7dc8d596183 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 23 May 2023 01:50:49 +0300 Subject: [PATCH 1/4] remove the progwml6 --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index e8d1986d..9e3ab123 100644 --- a/build.gradle +++ b/build.gradle @@ -61,10 +61,6 @@ repositories { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } - maven { - name = "progwml6" - url = "https://dvs1.progwml6.com/files/maven/" - } maven { name = "blamejared" url = "https://maven.blamejared.com/" From fe23531c0ed012c4e382433feb4ac76e4d9b067a Mon Sep 17 00:00:00 2001 From: KillReal6996 Date: Sat, 27 May 2023 00:57:52 +0300 Subject: [PATCH 2/4] Part/0 Training Trying to add item - Jack Daniels (complete) Trying to add custom model for item - cheese (failed) --- .../gregtechfoodoption/item/GTFOMetaItem.java | 33 +++++++++++++++++- .../metaitems/food/alcohol/jack_daniels.json | 6 ++++ .../item/metaitems/food/models/cheese.json | 6 ++++ .../metaitems/food/alcohol/jack_daniels.png | Bin 0 -> 332 bytes .../items/metaitems/food/models/cheese.json | 21 +++++++++++ .../items/metaitems/food/models/cheese.png | Bin 0 -> 363 bytes 6 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index 0ca08c79..a382d705 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -17,12 +17,19 @@ import gregtechfoodoption.potion.*; import gregtechfoodoption.utils.GTFOLog; import gregtechfoodoption.utils.GTFOUtils; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import squeek.applecore.api.food.FoodValues; @@ -376,6 +383,11 @@ public class GTFOMetaItem extends MetaItem imple public static MetaItem.MetaValueItem EMERGENCY_RATIONS; + //KillReal items + public static MetaItem.MetaValueItem JACK_DANIELS; + public static MetaItem.MetaValueItem CHEESE; + // + public GTFOMetaItem() { super((short) 0); } @@ -883,6 +895,14 @@ public void registerSubItems() { WHITE_GRAPE_SEED = addItem(321, "seed.white_grape"); WHITE_GRAPE_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_WHITE_GRAPE, WHITE_GRAPE_SEED.getStackForm(), WHITE_GRAPES.getStackForm())); + //ALCOHOL + JACK_DANIELS = addItem (326,"food.alcohol.jack_daniels").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE), + new RandomPotionEffect(MobEffects.NAUSEA, 600, 0, 100 - 60), + new RandomPotionEffect(MobEffects.RESISTANCE, 400, 0, 100 - 40)) + .setEatingDuration(96)); + // + //Experiment + CHEESE = addItem (327,"food.models.cheese").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE))); // 175-189 left blank for organic circuits SPRINKLER_COVER = addItem(224, "cover.sprinkler"); @@ -996,6 +1016,17 @@ protected void addItemComponentsInternal(IItemComponent... stats) { } } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public static void onRegistryModel(ModelRegistryEvent e) { - + } + @SideOnly(Side.CLIENT) + private static void registryModel(Item cheese) { + final ResourceLocation regName = cheese.getRegistryName(); + final ModelResourceLocation mrl = new ModelResourceLocation(regName, "inventory"); + ModelBakery.registerItemVariants(cheese, mrl); + ModelLoader.setCustomModelResourceLocation(); + //TODO understand what is this ._. + } } diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json b/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json new file mode 100644 index 00000000..76537caa --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/alcohol/jack_daniels.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/food/alcohol/jack_daniels" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json new file mode 100644 index 00000000..f881aef1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json @@ -0,0 +1,6 @@ +{ + "parent": "cheese/generated", + "textures": { + "layer0": "gregtechfoodoption:food/models" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png b/src/main/resources/assets/gregtech/textures/items/metaitems/food/alcohol/jack_daniels.png new file mode 100644 index 0000000000000000000000000000000000000000..6994e4b26e56459a28558a8094ee2545a1485be4 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`KRsO>Lo9l?PCDpy*g>Fe|HYPw zEt6#Sgm7wkG@V@7?(|`0O{*N2ZH2JB!w23PZg~ZBNB*x$mTXZyZz?8;Y}{=c_D7%j zwEg{m#=Ae9zog<>GB@$Hx>M}++41(4-@d+cGV?Dms&FsO-7j5G`fMeG(xKdkeu~=; z&o1_Vp1&cZ5_qHG=>I``{>PH5*{m^kvKQC?TA_7J zB4nxoPvi8whOpE~rU}bdUQTA+GW-0doS6^8yB Date: Sat, 27 May 2023 10:09:07 -0500 Subject: [PATCH 3/4] Some fixes to the object model --- .../java/gregtechfoodoption/ClientProxy.java | 5 +- .../gregtechfoodoption/item/GTFOMetaItem.java | 35 +++++-------- .../item/metaitems/food/models/cheese.json | 6 --- .../item/metaitems/food/models/cheese.mtl | 4 ++ .../item/metaitems/food/models/cheese.obj | 49 ++++++++++++++++++ .../items/metaitems/food/models/cheese.json | 21 -------- .../items/metaitems/food/models/cheese.png | Bin 363 -> 440 bytes 7 files changed, 70 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.json diff --git a/src/main/java/gregtechfoodoption/ClientProxy.java b/src/main/java/gregtechfoodoption/ClientProxy.java index 28ffc451..b469c39e 100644 --- a/src/main/java/gregtechfoodoption/ClientProxy.java +++ b/src/main/java/gregtechfoodoption/ClientProxy.java @@ -1,6 +1,7 @@ package gregtechfoodoption; import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import gregtech.api.GTValues; import gregtech.api.util.LocalizationUtils; import gregtechfoodoption.block.GTFOMetaBlocks; import gregtechfoodoption.entity.GTFOEntities; @@ -14,6 +15,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; @@ -42,13 +44,14 @@ public void preLoad() { Minecraft.getMinecraft().getFramebuffer().enableStencil(); } GTFOEntities.registerRenders(); + OBJLoader.INSTANCE.addDomain(GTValues.MODID); } @Override public void onLoad() { super.onLoad(); - if(Loader.isModLoaded("appleskin")) { + if(Loader.isModLoaded(GTFOValues.MODID_AP)) { GTFOMetaTooltipOverlay.init(); GTFOMetaHUDOverlay.init(); } diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index a382d705..2167a32c 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -17,19 +17,12 @@ import gregtechfoodoption.potion.*; import gregtechfoodoption.utils.GTFOLog; import gregtechfoodoption.utils.GTFOUtils; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import squeek.applecore.api.food.FoodValues; @@ -896,13 +889,14 @@ public void registerSubItems() { WHITE_GRAPE_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_WHITE_GRAPE, WHITE_GRAPE_SEED.getStackForm(), WHITE_GRAPES.getStackForm())); //ALCOHOL - JACK_DANIELS = addItem (326,"food.alcohol.jack_daniels").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE), + JACK_DANIELS = addItem(326, "food.alcohol.jack_daniels").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE), new RandomPotionEffect(MobEffects.NAUSEA, 600, 0, 100 - 60), new RandomPotionEffect(MobEffects.RESISTANCE, 400, 0, 100 - 40)) .setEatingDuration(96)); // //Experiment - CHEESE = addItem (327,"food.models.cheese").addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE))); + CHEESE = addItem(327, "food.models.cheese").setHasObjModel(true) + .addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE))); // 175-189 left blank for organic circuits SPRINKLER_COVER = addItem(224, "cover.sprinkler"); @@ -956,7 +950,7 @@ public ItemStack getContainerItem(ItemStack stack) { protected String formatModelPath(GTFOMetaItem.GTFOMetaValueItem metaValueItem) { - return "metaitems/" + metaValueItem.unlocalizedName.replace('.', '/'); + return "metaitems/" + metaValueItem.unlocalizedName.replace('.', '/') + (metaValueItem.hasObjModel ? ".obj" : ""); } @Override @@ -992,6 +986,7 @@ public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList.MetaValueItem { + private boolean hasObjModel; protected GTFOMetaValueItem(int metaValue, String unlocalizedName) { super(metaValue, unlocalizedName); @@ -1015,18 +1010,14 @@ protected void addItemComponentsInternal(IItemComponent... stats) { } } - } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public static void onRegistryModel(ModelRegistryEvent e) { + public boolean hasObjModel() { + return hasObjModel; + } + public GTFOMetaValueItem setHasObjModel(boolean hasObjModel) { + this.hasObjModel = hasObjModel; + return this; + } } - @SideOnly(Side.CLIENT) - private static void registryModel(Item cheese) { - final ResourceLocation regName = cheese.getRegistryName(); - final ModelResourceLocation mrl = new ModelResourceLocation(regName, "inventory"); - ModelBakery.registerItemVariants(cheese, mrl); - ModelLoader.setCustomModelResourceLocation(); - //TODO understand what is this ._. - } + } diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json deleted file mode 100644 index f881aef1..00000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "cheese/generated", - "textures": { - "layer0": "gregtechfoodoption:food/models" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl new file mode 100644 index 00000000..db137b42 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.mtl @@ -0,0 +1,4 @@ +# Made in Blockbench 4.7.2 +newmtl m_cdaf725b-c014-6e84-0212-03660f359c4a +map_Kd gregtech:items/metaitems/food/models/cheese +newmtl none diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj new file mode 100644 index 00000000..2ddff937 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj @@ -0,0 +1,49 @@ +# Made in Blockbench 4.7.2 +mtllib cheese.mtl + +o cube +v 0.1875 0.5625 0.1875 +v 0.1875 0.5625 -0.1875 +v 0.1875 0.4375 0.1875 +v 0.1875 0.4375 -0.1875 +v -0.1875 0.5625 -0.1875 +v -0.1875 0.5625 0.1875 +v -0.1875 0.4375 -0.1875 +v -0.1875 0.4375 0.1875 +vt 0.375 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0.375 0.875 +vt 0.375 0.875 +vt 0.75 0.875 +vt 0.75 0.75 +vt 0.375 0.75 +vt 0.375 0.75 +vt 0.75 0.75 +vt 0.75 0.625 +vt 0.375 0.625 +vt 0.375 0.625 +vt 0.75 0.625 +vt 0.75 0.5 +vt 0.375 0.5 +vt 0.375 0.625 +vt 0 0.625 +vt 0 1 +vt 0.375 1 +vt 0.375 0.625 +vt 0 0.625 +vt 0 0.25 +vt 0.375 0.25 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl m_cdaf725b-c014-6e84-0212-03660f359c4a +f 4/4/1 7/3/1 5/2/1 2/1/1 +f 3/8/2 4/7/2 2/6/2 1/5/2 +f 8/12/3 3/11/3 1/10/3 6/9/3 +f 7/16/4 8/15/4 6/14/4 5/13/4 +f 6/20/5 1/19/5 2/18/5 5/17/5 +f 7/24/6 4/23/6 3/22/6 8/21/6 \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.json b/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.json deleted file mode 100644 index 5c2cf392..00000000 --- a/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "cheese", - "particle": "cheese" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 2, 11], - "faces": { - "north": {"uv": [6, 0, 12, 2], "texture": "#0"}, - "east": {"uv": [6, 2, 12, 4], "texture": "#0"}, - "south": {"uv": [6, 4, 12, 6], "texture": "#0"}, - "west": {"uv": [6, 6, 12, 8], "texture": "#0"}, - "up": {"uv": [6, 6, 0, 0], "texture": "#0"}, - "down": {"uv": [6, 6, 0, 12], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png b/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png index a60b5fa393a59e73b9a753bc372bfed176286538..67761c30992ae1e8e4229633f1d9eb2c131b60d6 100644 GIT binary patch delta 415 zcmV;Q0bu^?0=NT^BYyw^b5ch_0Itp)=>Px$a!Eu%R5(w?k-bU-Q4oc{xtraMA^ue2 zT8X3)qhcc}MjKy2d zJUBp+4^t#=hD7TRS-?jX%?fR0I66<**&anD04b7~0`a@gela5)wC*sDDz;0@_tit*`^|Q(+zzACUlceGBl3n+cPZyI&6OhaEui(yjYlAlvVN z?M&Qg6Rq830j=6Z7a#!5f$<3z9y5d8xidRx)k|pvyM4doL_C7IY}USj#@(!fhhh*( z-*}8I-45p9<#Im#3j!jj3L?Vv=KWxRe%1!<5A>D4U>N@o_yj$kZV@=m{rUg^002ov JPDHLkV1hEky=(vg delta 337 zcmV-X0j~bI1M32iBYy!hNklJZ z9CZOxGaU5VhXYu}=wuyP4XPnz%ra7#4>;&Qf+81JiOKy6g-jviWZVM|26N4p(BbOI3DO6(25sc;e^;Y9F=V>qP?kS&5DP5`SB36$C& zwO}Qri1g6~6iO}40LtJ^An)9ESN?+{VHp$=0hC%$ciVFTZ|@Zla15#Kv*Y{@czy}Z j6%fdAFG&7pz`x)VxhqH%u+AZf00000NkvXXu0mjf7cGp1 From 87882bad4fbd9123d158759faab6018d76ac29cb Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sat, 27 May 2023 12:52:37 -0500 Subject: [PATCH 4/4] Center object model --- .../gregtechfoodoption/item/GTFOMetaItem.java | 28 ++- .../item/gradle/wrapper/gradle-wrapper.jar | Bin 55618 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - .../assets/gregtech/models/item/gradlew | 172 ------------------ .../assets/gregtech/models/item/gradlew.bat | 84 --------- .../item/metaitems/food/models/cheese.obj | 28 +-- .../items/metaitems/food/models/cheese.png | Bin 440 -> 5909 bytes 7 files changed, 41 insertions(+), 276 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar delete mode 100644 src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties delete mode 100644 src/main/resources/assets/gregtech/models/item/gradlew delete mode 100644 src/main/resources/assets/gregtech/models/item/gradlew.bat diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index 2167a32c..da3610fa 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -17,11 +17,14 @@ import gregtechfoodoption.potion.*; import gregtechfoodoption.utils.GTFOLog; import gregtechfoodoption.utils.GTFOUtils; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -896,7 +899,7 @@ public void registerSubItems() { // //Experiment CHEESE = addItem(327, "food.models.cheese").setHasObjModel(true) - .addComponents(new GTFOFoodStats(4, 0.7f, true, true, new ItemStack(Items.GLASS_BOTTLE))); + .addComponents(new GTFOFoodStats(4, 0.7f)); // 175-189 left blank for organic circuits SPRINKLER_COVER = addItem(224, "cover.sprinkler"); @@ -1020,4 +1023,27 @@ public GTFOMetaValueItem setHasObjModel(boolean hasObjModel) { } } + @SideOnly(Side.CLIENT) + public void registerModels() { + for (short itemMetaKey : metaItems.keySet()) { + GTFOMetaValueItem metaValueItem = metaItems.get(itemMetaKey); + int numberOfModels = metaValueItem.getModelAmount(); + if (numberOfModels > 1) { + ModelResourceLocation[] resourceLocations = new ModelResourceLocation[numberOfModels]; + for (int i = 0; i < resourceLocations.length; i++) { + ResourceLocation resourceLocation = createItemModelPath(metaValueItem, "/" + (i + 1)); + ModelBakery.registerItemVariants(this, resourceLocation); + resourceLocations[i] = new ModelResourceLocation(resourceLocation, "inventory"); + } + specialItemsModels.put((short) (metaItemOffset + itemMetaKey), resourceLocations); + continue; + } + ResourceLocation resourceLocation = createItemModelPath(metaValueItem, ""); + if (numberOfModels > 0) { + ModelBakery.registerItemVariants(this, resourceLocation); + } + + metaItemsModels.put((short) (metaItemOffset + itemMetaKey), new ModelResourceLocation(resourceLocation, "inventory")); + } + } } diff --git a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 58499e4f0f165e3675625ddb3bbc176da697d2e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55618 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�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%0AFe;)Grk!CPA88c9MU{Dk7_ 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 F{|{XF1uy^r diff --git a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 2c2bbe5f..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/src/main/resources/assets/gregtech/models/item/gradlew b/src/main/resources/assets/gregtech/models/item/gradlew deleted file mode 100644 index 9d9cdba7..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS --illegal-access=permit $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/src/main/resources/assets/gregtech/models/item/gradlew.bat b/src/main/resources/assets/gregtech/models/item/gradlew.bat deleted file mode 100644 index f9553162..00000000 --- a/src/main/resources/assets/gregtech/models/item/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj index 2ddff937..40eddeb7 100644 --- a/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj +++ b/src/main/resources/assets/gregtech/models/item/metaitems/food/models/cheese.obj @@ -2,14 +2,14 @@ mtllib cheese.mtl o cube -v 0.1875 0.5625 0.1875 -v 0.1875 0.5625 -0.1875 -v 0.1875 0.4375 0.1875 -v 0.1875 0.4375 -0.1875 -v -0.1875 0.5625 -0.1875 -v -0.1875 0.5625 0.1875 -v -0.1875 0.4375 -0.1875 -v -0.1875 0.4375 0.1875 +v 0.6950825214724776 0.5700825214724776 0.676776695296637 +v 0.5075825214724776 0.7575825214724776 0.4116116523516815 +v 0.7575825214724776 0.5075825214724776 0.5883883476483185 +v 0.5700825214724776 0.6950825214724776 0.32322330470336313 +v 0.24241747852752238 0.4924174785275224 0.4116116523516815 +v 0.4299174785275224 0.3049174785275224 0.676776695296637 +v 0.3049174785275224 0.4299174785275224 0.32322330470336313 +v 0.4924174785275224 0.24241747852752238 0.5883883476483183 vt 0.375 1 vt 0.75 1 vt 0.75 0.875 @@ -34,12 +34,12 @@ vt 0.375 0.625 vt 0 0.625 vt 0 0.25 vt 0.375 0.25 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 +vn -0.5000000000000001 0.5000000000000001 -0.7071067811865476 +vn 0.7071067811865475 0.7071067811865476 0 +vn 0.5000000000000001 -0.5000000000000001 0.7071067811865476 +vn -0.7071067811865475 -0.7071067811865476 0 +vn -0.5 0.5 0.7071067811865476 +vn 0.5 -0.5 -0.7071067811865476 usemtl m_cdaf725b-c014-6e84-0212-03660f359c4a f 4/4/1 7/3/1 5/2/1 2/1/1 f 3/8/2 4/7/2 2/6/2 1/5/2 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png b/src/main/resources/assets/gregtech/textures/items/metaitems/food/models/cheese.png index 67761c30992ae1e8e4229633f1d9eb2c131b60d6..1e0c43c93276474bcdcd5812645e58802677c70e 100644 GIT binary patch literal 5909 zcmeHKc{r5o`=9JlmMB7*23czMg&9U!BL*R%&@AsT%+}0kEQ#VIS)xu7N=c5=5s}Do zkgcf5+D0d>mMn2nC-Hqp%c<-4{io~tegA8&Yu@*HpXYOb?)&~c_w&5(lj!ccX{n;N zA_M|i>f~tW0p3+5e+4=4sy8)Hg+OGdBE5V>9#k=uFW@m*Yyc{X-~&(~oW+Dd!XKR5 z7J6jLc*$(L$y){Jq-x6(-z#SKp7Q9copjr`;j1Sb*T(+R-M=h3WPY~4C-9wW#Fk#! z$-7Z0hf@e1Hn!8V`6Jx&nz50Dft160!{ikFla1PQ2m5CGdD97oM>_<(1Nj&C%@S2# zUq+hQ;`A&nwO?Ob(gYl2DQ5!E+a=|Pmkrq7;8=~M+P&D8l6}nWYVBV6)7w_{QuCS* z;Ky#YEm|GuozuauRF`+bg|B_|w5Qfq3hHKl(k*^dbY+O1QFMvG??qK$|NYD51rtjd zF{ciHY^{6<$qjoI4Xi7&&;8gb%3R&wq4#*8XnGyfF8!i>_g>j6wpD(a$4eW1{4{n< zl?z?m6`leVyq5h z<&Dd|)*I>-alh(XjO0uq%y->2Y#)exS);O7qe;WuXZenaH8P9Q2Gr8QMrYM@V-pXC z21PS^$rf6&3H7#2+hU%Pi=&C>3wD|3{g-KmEjfzMJlVUNj=SeK9x>foT&UO6=YFm^ zD~pxpQFa^u*yiYp?Zat)K|LIC|4hfZmQ%{1NxhdwG%ucL()M>rNqkarU_iBEF}5{P zCubkZqc?UEWgL5&#V=^`agM91Kapx2GpgWvt=<wkzePLzqss!MFr+ZlRRf05|vPo(IE)wFGgl38S2&K+Bjp% zPo{Rs#dG3*Rnq#~@yck)yDd#BFv9Sw^{&UGOwP&IoJ6&qnrvU?g!K@0xK(X$|0P%S z^6(h9(gp1Xzf{+A)O%x54f|PYi2H|KLHnPrUlqd)SX&w*ZJgrGULK@uK$*XDj92bj zto3{@cFbAKvM_%1tfM;bI`={B-6+jF54u(>I~(78Xgg%i>&Y#P2=@I5Z8D0^-P{>p zk#Gw>{Nzlec=DY(tKpv%r0-QouhC`8qZyZam#38qOEy0noIOO*%y~Dbnmx_%+KyRr z&PeQ2V>Y|nIM?3ng;Sm{(D?hs$oKPE%CpSG$);xJn>*-H@1e7?MO6c)?=YQcm!ee` zlmx_xX)x1Qu16`afxcbUQhevGtWHwd{XStHH=ES``e^49hv=Sc zDBtqrr1#p+r@C*Yd}e&aO&ia@c9=iUn6BEjnwVK*-@NLwbUD0GqtEg>YtuNZ`n2Gt z^SZ^vt}5=3T@E1jDV%do>)~b&hQmI#Is~#Po@Hz6?qqBGW%~y={ha7@vSY(W-KIcKXM0ooQRr~m z8IrH+@?G7g8fR<@m-~gGs-~5)a0Vub)cv9L^@p1-#3hv#D;MvFzFRanJedCqW;lm5 zDL?r4UzK{}W8|@cMK(3Ja7CfI9ioRWhJ&=V)uwWRYIUmrs5-baGtfp(P9ojFnTg52 z5zS?!+z-O(3&f;FR_WmxD+?%pSXC$); z@z=-XKTVXTA4`!#19-QibF3h&Vbcg{U0tcOvaJE*6Juj<2j<9KqvP`WNrHsyMXK)L zYg(HHzK(q;E+jgSgP<~aGyoCK;e)Sh2*h$jIG;)n1w>F95X9n=VdK@cFer;bhHb-B zP!zr`5X^Fn6ab!)u3q%WP&$zT+hC<=8BPKTIDm)>4d<}ALQ*&xw!ljQ+mdc147vaj zg_2=D6nCgCPXIu12pj?hw-0CS#=xu;p_T#$ljLFN@RExA`ywgATby?h=2^(gP6k!US}{emB4s z>3>VXpntXJhY8pV=`iR>fDLd!s1Wpu{?6qlCyM)53yB0lEDnFc3KaW0q=?1*SFG=1 zlZ-5+^KBrY`B&cW&|h+20D~wBg=EL0he^V7vLnMJ{z(iToy8z6G?^$Y-W!ih#9J_{n577~~Y zC@fV{ry#+C1(*xTRsc{%Jb@RF$0oxh0YD{|3*`;9{4^AMT;6y4O zoGd&V09)W9G{XWkEI?$S%*-+0vkQ4lk(ep~tb@Qz!EC?+TF3@!ydb5?_h@l2Akhhh z!NO5^IL6EijUl0lB$VWlghIiPpA$w(R`r*REs_666Uzm_H`@Sc_o)xuUclW7`E|Sc zteHf{|KacRT>K9`fYd*o{E)ss<@zbt4=M0N;Gfm?Q?4IU;D^9JtLy(wF2#QjJOCH` z3KE0InTmTye*=#~ax~{nc90cd%c^gG<6H2)nD6K-gg}(QGp&;PB1l$_7T75-a-!JF zzm(NcQEM6RG|0 z3|2(Q*WXDvs2#5%N25~d>Kb`BZjX-kr#6lGAE8y&R6QK8J$a0kWwRCS>40Z@tzSp9 zC^(dr7g894JgX7-_-IxhGgG_Zkfu@4rr-As2d~PHUUzCs*>W7bu;5S>bxT)dg{g6X zc6$E>G`_QS^iRT-dB({mXKC*)X6TwL>A2{qdT+T3g#?(L!euq95uHb?#4Rr9P`e60 z?xC);30O#d?2V37?1@~lz{h5^)l&11^7Wlh0_2?P^=Dk=ysdktIYSYt(VpE)&|r>Ka%!#z5RtqD+zG;$i*)Z(6Q ztnS1}dtF;!L(PY~8W7FneH=Ax_pPC7ojmRM`qA!TyIau&c1>`@{T?-lQ442&C@Qw~ zW+~L%RzuF@;4Qc`XX-RzaBK-^xE=~=KZO{Hz0iH3JH%b7v3x+bJvF5@rq^`oqKwN_ RX|NU`PWG;L#Wp+l{|AKMMZo|7 delta 415 zcmV;Q0bu@>F1Q1bBYyw^b5ch_0Itp)=>Px$a!Eu%R5(w?k-bU-Q4oc{xtraMA^ue2 zT8X3)qhcc}MjKy2d zJUBp+4^t#=hD7TRS-?jX%?fR0I66<**&anD04b7~0`a@gela5)wC*sDDz;0@_tit*`^|Q(+zzACUlceGBl3n+cPZyI&6OhaEui(yjYlAlvVN z?M&Qg6Rq830j=6Z7a#!5f$<3z9y5d8xidRx)k|pvyM4doL_C7IY}USj#@(!fhhh*( z-*}8I-45p9<#Im#3j!jj3L?Vv=KWxRe%1!<5A>D4U>N@o_yj$kZV@=m{rUg^002ov JPDHLkV1n*)y+Qy0